Check whether widgets are viewable, not just if they are mapped. (#122912,

Wed Mar  3 17:30:18 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_mnemonic_activate): Check
        whether widgets are viewable, not just if they are
        mapped. (#122912, reported by Tim Evans)

diff --git a/ChangeLog b/ChangeLog
index cd81c5a29e84294adffb94a1ae57b6103c3f42e0..c7f9a50fb19594a3ffee2d4adaa4076e12a2c4ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar  3 17:30:18 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_mnemonic_activate): Check
+       whether widgets are viewable, not just if they are
+       mapped. (#122912, reported by Tim Evans)
+
 Wed Mar  3 23:28:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_active): Move the actual

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cd81c5a29e84294adffb94a1ae57b6103c3f42e0..c7f9a50fb19594a3ffee2d4adaa4076e12a2c4ce 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Mar  3 17:30:18 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_mnemonic_activate): Check
+       whether widgets are viewable, not just if they are
+       mapped. (#122912, reported by Tim Evans)
+
 Wed Mar  3 23:28:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_active): Move the actual

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cd81c5a29e84294adffb94a1ae57b6103c3f42e0..c7f9a50fb19594a3ffee2d4adaa4076e12a2c4ce 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Mar  3 17:30:18 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_mnemonic_activate): Check
+       whether widgets are viewable, not just if they are
+       mapped. (#122912, reported by Tim Evans)
+
 Wed Mar  3 23:28:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_active): Move the actual

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cd81c5a29e84294adffb94a1ae57b6103c3f42e0..c7f9a50fb19594a3ffee2d4adaa4076e12a2c4ce 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Mar  3 17:30:18 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_mnemonic_activate): Check
+       whether widgets are viewable, not just if they are
+       mapped. (#122912, reported by Tim Evans)
+
 Wed Mar  3 23:28:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_active): Move the actual

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cd81c5a29e84294adffb94a1ae57b6103c3f42e0..c7f9a50fb19594a3ffee2d4adaa4076e12a2c4ce 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Mar  3 17:30:18 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_mnemonic_activate): Check
+       whether widgets are viewable, not just if they are
+       mapped. (#122912, reported by Tim Evans)
+
 Wed Mar  3 23:28:48 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_active): Move the actual

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 81b5b37909d1292b90149216e5f972cfef84e34c..b6d9da5c0117ad4491c65e681760fdb70853fb52 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1457,7 +1457,8 @@ gtk_window_mnemonic_activate (GtkWindow      *window,
       widget = GTK_WIDGET (list->data);
       
       if (GTK_WIDGET_IS_SENSITIVE (widget) &&
-         GTK_WIDGET_MAPPED (widget))
+         GTK_WIDGET_DRAWABLE (widget) &&
+         gdk_window_is_viewable (widget->window))
        {
          if (chosen_widget)
            {